projects / cargo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d1bfc01 535a67b)
Auto merge of #3311 - alexcrichton:fix-nightlies, r=brson
authorbors <bors@rust-lang.org>
Mon, 21 Nov 2016 21:18:02 +0000 (15:18 -0600)
committerGitHub <noreply@github.com>
Mon, 21 Nov 2016 21:18:02 +0000 (15:18 -0600)
commitf003b0ec57734150c38105a09d86e6529fdf7176
tree9d8c6bbb185cdca13a16f48dab4ead94b2472018tree | snapshot
parentd1bfc0196fb4476171060cfc3ee347642f6d25e4commit | diff
parent535a67b3b82ebb16bdf66a1dac781df14a4c6c81commit | diff
Auto merge of #3311 - alexcrichton:fix-nightlies, r=brson

Link OpenSSL statically on OSX

Now that Cargo requires OpenSSL >= 1.0.1 transitively through the `openssl-sys`
0.9 release the dynamic libraries for OpenSSL are no longer located on OSX by
default. This means that the support necessary for libssh2 needs to be
statically linked rather than dynamically linked.

Closes #3303
Unnamed repository; edit this file 'description' to name the repository.